Fix new bugs, styling of popups
Merge branch 'patrickbranch'