Refinagle layouts
Cleaning up for production
Update stats page