Changes: re-layout categories