fixed button states
nav tweaks