Cleaned up templates and some ui details