popups;layout changes; improved checks;