Removed redundant buttons