merged application-portal (again....)