improved the ui somewhat