js fixes, Rich page construction