Updated layout slightly