Fix timestamping, ui tweaks