Design tweaks (bug 994796, bug 994772)

(source: https://www.dropbox.com/s/uiaplb5ovsakjb4/tarakoPresentation.pdf )