azn - some design tweaks