Incorporating new styling with server
Styling cleanup