Cleaning up my hack by separating out the angular stuff into templates and CSS