Added assets and some changes here and there