Con 1298

Please think about not rendering both modules while only one is used.