Added panels for better UI
Removed serial numbers for categories as they don't work across pages