Removed Ember Junk
Added Angular Code
General Updated Code