move float modifiers to layout, improve alignment modifier names