final design tweaks, #30