Refactored week view and integration