Removing unnecessary buttons and refactoring
Refactoring