Feature/gh 3 add styling and layouts