Restructured layout to make the time marker work properly