Few layout changes and updates

Few layout changes and updates