Some graphical and helpful fixes