Added some minor changes from refactorings of the site

cc @pads, @taiyab.