Removing Validate Button for now. May be too much to undertake. Few minor changes otherwise.