Changed order for main overview
little bugfix
refactoring and bugfix
last version