Fixes validation logic and adds 'fields complete' message