more tunning, changed layouts