Tie selected button layout complete. Can get Stef to redesign buttons if he doesn't like them.