Update: Polish for Portrait and different resolution policy