Refactor GUI apps and UC Mode Refactor GUI apps --> This resolves #2179 --> This resolves #2177 Refactor UC Mode --> This resolves #2176