Updated views, added store controller