Code cleanup
Code cleanup
Code cleanup
Fixed orientation & preview issues.