merged style.css of draft branch
merged style.css of draft branch
several style changes