minor fixes with layout