refactor week view and display holidays properly