lots of design tweaks