Fix issue with moveing locaiton_id to parent_id
Cleaning organization views
Fix issue with asset controller when updating assets
Adding popups