Fix some things for basic app layout