Fix text visibility and several enhancement