mockups: finished, also did some corrections throughout
worktime: update