Fix wonky scrollspy positions, add mugs back into bill