layout improved a bit
1.3
#master: new layout