rafactor, added angular ui calendar