Took out calendar, changed layout