Bug Fixes, Orientation Fixed

See above