mostly ui and graphical fixes