Some UI fixes for Calendar Select Screen