Both portrait and landscape bugs fixed