more graphics and UI fix