Feature/dropdown fix