Fixed refactor and added a week selector