Modified layout slightly.