layout fixes - NIca