UI tweaks and pass name field into db