Improved source field displaying