Realignment 1: CSS incorporated into latest server side version

Incorporated changes and resolved conflicts with the CSS and HTML.