Base: Slight reworking of flow and manage site bug fix