Switched to buttons, added some labels