Added dropdown menu & other changes