Layout changes and bug fixes

Cancelled - Find more jobs like this here