sk-goto buttons and core improvements