Made a few small changes to UI and listeners