Finished implementation of user-interface