Changed layout so that it's a bit nicer to look at.