More modifications
Use different layouts, still lot to be fixed