Layout changes
Get app layout correct