refactoring
Merge pull request #118 from sulu-cmf/feature/layout

[FEATURE] refactoring to new layout