changed popup locations to fit