tighten up views. fix datepicker