improved styling and refactored button styling