fixing some MC layout issues