Layout improved
Better publish + bug fix