Updated design, fixed tab issues