Minor fixes
Previous screen command
Temporary close window command
Grid layout, new client hide/show logic
Minor refactoring
Config macros
Abolish service locator
Refactor tests