Did some styling and resolved calender issue