Improved dropdown

Some corrections