new design
almost there
tweaks