Changed links to buttons, added padding