dropdown menu reworked
Merge branch 'paulyves' into development