fixed top-menu and left sidebar
file refactoring for better lisibility
update readme
Merge branch 'master', remote branch 'origin' into refactor