Lots more stuff, including style and layout bits