changes to layout + some styling