Bug fixes in ViewStack and ContentLoader