Added enter key action and some UI changes

Added enter key action and some UI changes