Removed some redundant buttons