Added proper buttons. FUCK YEAH. BUTTTONS!