Fix Alignment Issues

css, html, modifications