Patient form improvements

use $last