Improve clubs list and view