Was stil working on mainpage_view, created new branch from dev for working on new/edit wifi page
Merge conflict resolved on wifi new form page