Added some ui tweaks and fixed a bug with clicking "enter"