Bunch of layout changes, categories properly displayed