Streamline markup.
Refactor app controller.