Corrected some orientation issuse