fixed layout problems, inherited from modal merge issues