add kiva support, update layout