profile popup refactoring
Merge branch 'master' of https://github.com/artificeren/FixbN.git