A few tweaks and cleanups, fixed to compile for Qt5.1.1

TODO:
* A few icons are missing