Merge pull request #25 from OndrejKuchta/feature/finaldesign

popup fix
Merge branch 'master' into feature/finaldesign
popup fixes