fixed with layout and system config
fixed conflicts