micro changes
Merge branch 'develop' into feature/popup2
some designfixes, popup