Added basic menu support