Updated settings, model cleanup, and some admin templates