Import changes from develop

 - Organise imgs, js, admin, helpers, etc
 - Refactor in order to accommodate changes
 - Fix issue with being able to register twice