stable overlay ui + misc refactoring