Updated main
merge
layout
more layout
last changes
discussion added