Add more options to datepicker, code enhancements

Better code formatting on HTML output.