Moved globals and container view into framework