Adding more buttons and refactoring css