PopOvers and other fixes