fix up the now bug and improve some of the layout and colours