less redundant code
Made the pop outs match the theme better.
Merge remote-tracking branch 'origin/development' into development