Improved layout, make images maintain aspect ratio