Fixed popup toggle not behaving as intended in all situations.
Also removed popup control methods from scope as they were not required.