Simplify modal header HTML and float close button
Make templates more similar with layout items being called
Merge branch 'master' of github.com:accelm/blackout-bmx