Layout fix
Layout improvements