revamp entire design, v2.0