Improved concept "look & feel" a little more
Some very very small fixes
Conflicts resolved