Fixed layout increasing main edit height
merge changes