Lots of design tweaks