Added resolve button. Possible router bugs