temporary graphical fix (really need layouts)