[Anil] - some layout and random fixes