fix layout and add sort category