Refactor system form page to avoid duplicate id's