Changing more wrappings and borders.

edited mainly the css