prepare final design tweaks for merge
small tweaks on design tweaks - teehee / cry