completed form UI refactor and fixed a couple of bugs around handling global pages