More menu functionality work.