BuildPage View Model tweaks