The top issue is fixed. I'm not sure what is breaking with the bottom issue.