Implemented more styling