#279: Using enter key to activate buttons / Minor fixes on navigation