Code cleanup and Alignment Component integration

@settinghead @donnapep @stulees please review. Will rebase and merge tomorrow. Thanks.