cleanup
better header structure, helper right button on header and on/off config variable for switching it
better less variables for general colors
Merge branch 'development'