Fixes edit user
Reorganizes tempaltes/files and starts on search