Cleaning up Util as well as fixing some small UI bugs