Fixed arrange button and tests.