layout fixed a little