Cleaning up UI
-Making templates more modular