Fixed some UI disfunctionalities