Tweaks to try and get view profile master layout working with it