new layout WIP
some corrections