Merge changes for forum page from Waibel fork