UI improved; began work on popup