Small fixes + restored tab order of view.