more styling and templates cleanup
more styling