controllers: some alignment fixes