Some cleaning and new category view