Updated validation checks. Added button