Several Improvements, still missing assign default value for the select box