Small fixes to resolve issue with UI page rendering