Building show page cool shit done
Merge branch 'buggs'