Adjusted layout. Better layout