Better tab navigation; remove unnecessary options