prettify mod and layout changes
layout merge