layout fixed a bit