fixes for iPad layout
Merge branch 'master' into tzcal