Make popup more space efficient