Added control buttons and changed some layout things