Big updates in design, also added start time and end time