Added new user interface. Need to polish it up