Added the custom dropdown and also made small fixes