several design tweaks and rendering fixes