UI optimizations, deprecated some old stuff