Tweak final pages, get closer to functionality