reorganize and add C-x p binding for previous window