Working on interface, cleaning up user experience