Cleaned up

Made all pop-ups run from the view package.