Fixed the buttons
Basic stuff done