Improved user interface

improved user interface