Cleaned up UI Manager