Latest Code committed

Some UI changes has been made and calendar implementation has been done.