More work on shifts view and added a silly header