Improving ul/li handling