seperate fitting in width and height for layouts
Merge branch 'layout_fit_width_and_height' into development