changed generic layout