refactor code, disable landscape, fixed switch account