Self-service portal and UI improvements

Related issue…