Quick fix for #37. Needs styling.