Add custom menu possibility
merge