Merge branch 'very-compact-layout'

Conflicts:
	src/Common/SettingsNames.cpp
	src/Gui/Window.cpp
	src/Gui/Window.h

REVIEW: 110653
fixes #40
fixes #564