Gear picture and UI fix