added UI for Legend and Controls section for Clock view
fixed merge conflicts