Some class updates for my website