Added styling and layouts