build update + menu cleanup