Fix expand and add Z-index to dropdown menu