Update screenshot and layout tweaks