Another improve of layout... now being much better
Some pets added