Update styles and some UX niceties