Added pagination buttons. Pulled out Week class