Updated advanced application mail layout to contain layout markers
Code style fixes for layouts