Enhance sidebar states