Finished up year bar at the top and added a datepicker
fixed merge conflicts