layout fixes and code additions for suresh changes