mainly style changes - committing so can test on device.