Fix for a visual bug, and beginning of ResourceLocator