Fixed displaying weekly and improved list efficiency