Layout clean up