Reworked categories navigation