UI optimizations, deprecated some old stuff

UI optimizations, deprecated some old stuff. Merge it.