all dropdown menu shit works
fixed merge issues