Bug fixes + ipad portrait