Improve paper movement in main state