Changed layout slightly.