Code clean-up
Adjust breadcrumb/stats positioning