Custom select and some minor tweaks.

Thanks, fixed it.