add margins component
fix merge conflicts
structure project