adding week selection and cleaning up layout