More restructuring, changed kategori to better match updated page