Add dropdown menu and minor tweaks