Refactoring and styling categories
Mini refactoring
ref and style lots
Add new logic to create lots