Cleanup.
Added Category Managment.