Removed City field and customized widget