fix height
Merge branch '5_updated_layout' into development