Edit UI Fix