Clean up styles and refactor components