Added more fields, dropdown support
minor beauty tweaks