Fixed scoping, up button bugs