Fix aspect ratio and layout