Updated layouts, positioning and images