updated styling and refactored a bit