Cleanup, fixes and new production standing
Spaces
Refactoring, JS template, clean up