Cleaning up and moving buttons into more conspicuous location