Legar margins & various fixes