Finish fixing layout mostly