more layour and style changes