Some fixes

Fixed some details on the user interface.