Added keyboard switching of views