1. More tab fixing