Added styling and small changes to structure