cleaned layout a little