Small refactors
Merge pull request #458 from anserran/master

Removing line that always fuckes up tests due statics not initialized
Minor changes that fix some bugs and improvement the UI
Merge pull request #447 from RotaruDan/UI-improvements

UI improvements
Merge pull request #457 from anserran/smallrefactors

Small refactors