This should take care of problems with elements not being full width. It won't generate any conflict with master either.