Fix versioning for web
Fix orientation
Reduce wait time for syncing
Clean up code