last layout bugs fixes
Merge branch 'develop' of github.com:secretariat/citrusdev into develop