Fixing popup scrolling -> scroll bar rescales correctly and margins are right