Cleaned up a lot dealing with PopupWindows/ Label is now a Container