cleanup templating use templateUrl; more refactoring required :)