fix layout and colours
misc