Small layout change

- More precise layouts