Cleaning up angular stuff
starting fixing templates
added bootstrap