Changed layout slightly