Manage Templates Tab UPDATE

Made the code more cleaner/better than the commit before.