Separated out categories, fixed stylings