layout, incon, more minnor changes