UI additions and improvements, added quit method, fixed some bugs