Added more styling and minor refactoring