worked a little
changed layout too