Fixing numbering bugs
Small cleanups
Adjusting sizes in CSS