Campbell, most of the changes you made seem ok, but you do have to be careful since it's not just about looking good, it's also about grouping things meaningfully. We did some thoughts on more concrete guidelines for this here: http://mediawiki.blender.org/index.php/BlenderDev/UIAlignRulesGuides