Updated to include module properties inline with page for easier management