UI looks Djanky, but the shift am and shift pm stuff is now in there.
Merge branch 'austin'