Minor changes to layout across screens
Update