layout and ICA fixes

ICA fixes