Improved validation add form