ux fixes and some style changes