changed popup controllers a bit