Renamed url to uri for correctness
Added content-wrapper div to main layout