Refactored to use Angular.js views