layout refined

Module layout changed