icons and clean up ui and usability