Cleanups and Week View...

Cleanups and Week View...