fix problema 4-6
Fix dropdown
Try to merge