New styling of main dropdown + Major bug fixes

+Code cleaning
+Optimization
merging