Tweeking layout and tests.