Refactoring memorabilia layout
Merge branch 'bum-reset' into bum