UI text changes and minor refactor