Custom select and some minor tweaks.