Added some UI fixes and calendar icon