fixing next/previous/focus