Improve UI and add has_esncard checkbox