adjust styling and views and add some js magic