general ui tidy up