small fixes
Merge remote-tracking branch 'origin/newBranch' into newBranch
design fixes + added a lot of assets