Revert "Some layout fixes"

This reverts commit c653dde76056073bbda0ffd149ed7e3016d16484.
Revert "Revert "Some layout fixes""

This reverts commit aa3c2d630a664bfaaa8170fed37bbcdb5a075cef.
Revert "Some layout fixes"

This reverts commit c653dde76056073bbda0ffd149ed7e3016d16484.
Example Test für Travis
Merge origin/master