Added some styling and tabbing