major redesign, add shortcuts