Preparing Homepage for v2