More Restructuring, Added Handlers, Added HTML, Added Angular.js