Finish fixing layout mostly2