[website] added form macros and other cleanups