Moved the week package into views and changed some formatting