Fixed datamodels and added account index controller