added some layout changes