sort out scrolling issue + update styles