ui stuff cleaned up