Fixed coding style and dropdown tweaks