layout changed a little bit
merged