merge cool-kitten
update menu & info