last visual aspects
Merge conflicts