Changed location of assets
Fixed comment
View stuff mostly