Layout changes

Make icons and buttons consisten across pages