MINOR - fixed some issues with url paths on upcoming page & layout