remove categories and fix layout