modify layout and styling
fix merge conflict
Merge pull request #39 from ahardy55/styling-and-ajax

modify layout and styling