Refactored and updated styling