Volker's UI changes. Removed a lot of unused materials etc.