Worked on site management and fixed operational flaw in user editing
merged changes