Ajust layout and styling