Implemented control buttons again

Now control buttons work as they should