Update UI & Finish Chart & Update TransitionDayForm.java
Merge conflict solved