remove older generic layout
unify layout use