Added a few more styling and layout fixed and additions