Added go-to button, other fixes