adjusts fake row of clocks
fixes bug in save button
Fixes merge conflicts