Better week selection with custom highlight