Fix offsets a bit
Visual tweaks