Add prototype for testing fixes for viewport issue

Also updates for the guides template