Data entry style improved
Notifications added