<ul> and <ol> additions
updated UI
Add HTML tags, remove last item
fixed conflics