fixes arrangement by Category

Change-Id: I5dede101a0183927c7e328eb30070d50958219ad