Fixed some style / UI issues