Created by: hbekel
Some optimizations and improvements to the ui, please see the individual commit messages.