Added <ul> to make display look better.
Merge remote-tracking branch 'origin/master'