Wider layout. Fixed footer padding
Fix conflicts