Border/Separator fixes