reset focus and make enter key behavior more sane - closes #337

pressing enter while focusing on skip or previous shouldn’t go to next
step