Fix flag collision with ui flag, fix attached label borders