Fix picker btn and add status validation