Adding notifications and simple fields validation