navigation adjustments, button creation changes