Bug Fixes for context menu and time control pop ups