Fixed Stuff With Controller & View