fix error when editor is turned off and we go to other page + some minor styling update
cleaning and update namespacing