Changed layout to be more readable.