Re-factored controllers as well as removed the Network Selection Window