added margins
adjusted class names
fixed conflicts