Cleaned up categories display order