v2.0 changed whole layout