Fixing some crashes and only portrait mode enabled