Close #2
Remove unused toolbar and statusbar
Fixes for key in uppercase