Solve some UI issues