Refactoring adding more styling