Improve list UI
Merge branch 'skin'