Navigation + menu done, buttons simplified