Lots of changes again. Mainly design.