layout cleaned
solved conflict: delete commented code