hopefully fixed broken pages - attempt 2