minor changes of layouts