Moved stuff around for timeScale styling