Fix #418
Fix UPMark hidden text and scrolling
Fix Calendar Issues