styling and ux
merge fixes