better layout and informations