emproving some layout
Merge branch 'master' into changes_on_ubuntu