REFACTOR: Fixed styling for components