Fixed bug when pressing Enter. Added some UI changes.