Fixed multi-orientation issue

Ready for FB integration