set up categories, cleaned up design