Applied some alignment policies
refs #245