some controller change
Fixed the model, added some angular stuff