Design fix + data update
Some changes here and there