Update popup markup, fixes bug in load order and security types