Edited model structure to consistent format, added TODOs to assets/javascript and some of the views