Various visual cleanups and enhancements