Support for rotating screen
Support for large screens
fix commit error