Improve Now feature
Add feature to manage Group