continue to fix broking page bugs