#10 Improve index markup
#11 Update style to use more space